Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 04:18:47 +0000 (21:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 04:18:47 +0000 (21:18 -0700)
commit360606e37ca87b54d7ee11cbd10efb102e689156
tree0537e535414e6a76f46de19166700f0468fd3cda
parenteb050c61f99b89e5e9cd6614571642d44e027935
parent9e434ab4711570d011f04b9f1a5ae24a6cb217ba
Merge from trunk.